Revision: bazaar--devel--1.1--patch-64
Archive: robert.collins@canonical.com--general
Creator: Robert Collins <robert.collins@canonical.com>
Date: Tue Jan 11 12:57:26 EST 2005
Standard-date: 2005-01-11 01:57:26 GMT
Renamed-files: tests/.arch-ids/test-changes.sh.id tests/.arch-ids/test-status.sh.id
    tests/.arch-ids/test-file-diffs-baz.sh.id tests/.arch-ids/test-file-diff-baz.sh.id
    tests/test-changes.sh tests/test-status.sh
    tests/test-file-diffs-baz.sh tests/test-file-diff-baz.sh
    tests/test-file-diffs.sh tests/test-file-diff-tla.sh
Modified-files: commands/apply-delta.c commands/cmdutils.c
    commands/cmdutils.h commands/update.c
    libarch/archive-pfs.c tests/Makefile.in
    tests/test-file-diff-baz.sh tests/test-file-diff-tla.sh
    tests/test-framework tests/test-simple-commits-2.sh
    tests/test-status.sh tests/test-tree-version.sh
    tests/test-update.sh
New-patches: rob.weir@canonical.com--2004-public/baz--bug4503--0--base-0
    rob.weir@canonical.com--2004-public/baz--bug4503--0--patch-1
    rob.weir@canonical.com--2004-public/baz--bug4503--0--patch-2
    rob.weir@canonical.com--2004-public/baz--bug4503--0--patch-3
    rob.weir@canonical.com--2004-public/baz--bug4503--0--patch-4
    rob.weir@canonical.com--2004-public/baz--bug4503--0--patch-5
    rob.weir@canonical.com--2004-public/baz--bug4503--0--patch-6
    rob.weir@canonical.com--2004-public/baz--bug4503--0--patch-7
    rob.weir@canonical.com--2004-public/baz--bug4585--0--base-0
    rob.weir@canonical.com--2004-public/baz--bug4585--0--patch-1
    rob.weir@canonical.com--2004-public/baz--bug4585--0--patch-2
    rob.weir@canonical.com--2004-public/baz--bug4585--0--patch-3
    rob.weir@canonical.com--2004-public/baz--bug4585--0--patch-4
    rob.weir@canonical.com--2004-public/baz--bug4585--0--patch-5
    rob.weir@canonical.com--2004-public/baz--bug4585--0--patch-6
    rob.weir@canonical.com--2004-public/baz--bug4585--0--patch-7
    rob.weir@canonical.com--2004-public/baz--bug4585--0--patch-8
    rob.weir@canonical.com--2004-public/baz--bug4585--0--patch-9
    rob.weir@canonical.com--2004-public/baz--bug4585--0--patch-10
    rob.weir@canonical.com--2004-public/baz--bug4585--0--patch-11
    rob.weir@canonical.com--2004-public/baz--bug4585--0--patch-12
    rob.weir@canonical.com--2004-public/baz--bug4585--0--patch-13
    rob.weir@canonical.com--2004-public/baz--bug4695--0--patch-1
    rob.weir@canonical.com--2004-public/baz--bug4695--0--patch-2
    rob.weir@canonical.com--2004-public/baz--bug4695--0--patch-3
    rob.weir@canonical.com--2004-public/baz--bug4740--0--base-0
    rob.weir@canonical.com--2004-public/baz--bug4740--0--patch-1
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-64
    thelove@canonical.com/bazaar--devo--1.1--patch-98
    thelove@canonical.com/bazaar--devo--1.1--patch-99
    thelove@canonical.com/bazaar--devo--1.1--patch-100
    thelove@canonical.com/bazaar--devo--1.1--patch-101
    thelove@canonical.com/bazaar--devo--1.1--patch-102
    thelove@canonical.com/bazaar--devo--1.1--patch-103
    thelove@canonical.com/bazaar--devo--1.1--patch-104
Summary: merge from thelove@canonical.com/bazaar--devo--1.1
Keywords: 

Patches applied:

 * rob.weir@canonical.com--2004-public/baz--bug4503--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-90

 * rob.weir@canonical.com--2004-public/baz--bug4503--0--patch-1
   Add arch_any_local_changes, which checks for local changes.

 * rob.weir@canonical.com--2004-public/baz--bug4503--0--patch-2
   Add arch_any_local_changes, which checks for local changes (er, header entry).

 * rob.weir@canonical.com--2004-public/baz--bug4503--0--patch-3
   Modify update to only print "reverting changes" stuff when there are actually changes.

 * rob.weir@canonical.com--2004-public/baz--bug4503--0--patch-4
   Add tests for the above.

 * rob.weir@canonical.com--2004-public/baz--bug4503--0--patch-5
   Sync up with THELOVE.

 * rob.weir@canonical.com--2004-public/baz--bug4503--0--patch-6
   Use new calling convention for arch_diff_default_output_dir().

 * rob.weir@canonical.com--2004-public/baz--bug4503--0--patch-7
   Use new calling convention for arch_diff_default_output_dir(), again.

 * rob.weir@canonical.com--2004-public/baz--bug4585--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-61

 * rob.weir@canonical.com--2004-public/baz--bug4585--0--patch-1
   Use missing instead of whats-missing in test-framework.

 * rob.weir@canonical.com--2004-public/baz--bug4585--0--patch-2
   Use file-diff instead of file-diffs.

 * rob.weir@canonical.com--2004-public/baz--bug4585--0--patch-3
   Use file-diff instead of file-diffs in test-file-diffs-baz.sh.

 * rob.weir@canonical.com--2004-public/baz--bug4585--0--patch-4
   Change test-changes.sh to use baz status instead of changes.

 * rob.weir@canonical.com--2004-public/baz--bug4585--0--patch-5
   Use a more sensical comment.

 * rob.weir@canonical.com--2004-public/baz--bug4585--0--patch-6
   test-changes -> test-status, fix up temp filenames.

 * rob.weir@canonical.com--2004-public/baz--bug4585--0--patch-7
   Fix comment in test-file-diffs-baz.sh.

 * rob.weir@canonical.com--2004-public/baz--bug4585--0--patch-8
   More sensible file-diff test file naming.

 * rob.weir@canonical.com--2004-public/baz--bug4585--0--patch-9
   Fix makefile to call renamed test files.

 * rob.weir@canonical.com--2004-public/baz--bug4585--0--patch-10
   Drop 'set -x' from test-tree-version.  Oops.

 * rob.weir@canonical.com--2004-public/baz--bug4585--0--patch-11
   Use "diff" instead of "changes" in test #7 of simple-comits-2.

 * rob.weir@canonical.com--2004-public/baz--bug4585--0--patch-12
   Sync up with THELOVE.

 * rob.weir@canonical.com--2004-public/baz--bug4585--0--patch-13
   Oops, use status-output uniformly.

 * rob.weir@canonical.com--2004-public/baz--bug4695--0--patch-1
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-89

 * rob.weir@canonical.com--2004-public/baz--bug4695--0--patch-2
   Add note that being unable to determine the archive format is not fatal.

 * rob.weir@canonical.com--2004-public/baz--bug4695--0--patch-3
   Shorten the note a lot.

 * rob.weir@canonical.com--2004-public/baz--bug4740--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-103

 * rob.weir@canonical.com--2004-public/baz--bug4740--0--patch-1
   Horribly hacky fix to stop apply-delta complaining about a missing -A (fixes: #4740).

 * thelove@canonical.com/bazaar--devo--1.1--patch-98
   automatically cacherev every 50 commits, closes: bug #4471

 * thelove@canonical.com/bazaar--devo--1.1--patch-99
   Fix deprecation warnings in the tests (#4585).

 * thelove@canonical.com/bazaar--devo--1.1--patch-100
   Only print 'undoing local changes' messages for update when there are local changes (closes #4695).

 * thelove@canonical.com/bazaar--devo--1.1--patch-101
   Don't use deprecated commands in tests (closes #4585).

 * thelove@canonical.com/bazaar--devo--1.1--patch-102
   merge in the sha1 code, again

 * thelove@canonical.com/bazaar--devo--1.1--patch-103
   Only print 'undoing local changes' messages for update when there are local changes (closes #4503).

 * thelove@canonical.com/bazaar--devo--1.1--patch-104
   Fix to stop apply-delta complaining about a missing -A (fixes: #4740).

